Upgrade ui #1066

jojohappy · 2019-04-23T07:02:25Z

Changes

fixes: #1042
Upgrade the Thanos ui to the Prometheus 2.9.1, new style of ui theme would be used, although I don't like it.

Verification

To visit the Thanos Query and Rule page.

@adrien-f Please help me to verify the store page, you are the original committer, thanks!

@bwplotka @povilasv Please help me to verify all of the pages, especially the rule page, I have not a rule component, thanks!

povilasv · 2019-04-23T07:33:40Z

@jojohappy nice work!

Add an entry to chanelog please :)

Do you have a docker image in dockerhub with this commit so that I can play around with it?

bwplotka · 2019-04-23T09:17:07Z

Nice!

jojohappy · 2019-04-23T11:07:51Z

@povilasv @bwplotka @adrien-f you can get the image by jojohappy/thanos:upgrade_ui. Thanks!

GiedriusS · 2019-04-23T21:03:03Z

Nice but it's kind of hard to review so many different (generated) files. Could you tell us how did you do this? Did you copy/paste over the relevant files? 😄

GiedriusS · 2019-04-23T21:05:11Z

pkg/ui/static/js/graph_template.handlebar

                              type="button"
                              name="dec_end"
                              title="Rewind the end time.">
                            <i class="glyphicon glyphicon-backward"></i>
-                          </button>
+                          </button><!--


do we need this comment, for example? that's why I'm wondering 😄

Just following the upstream (: I don't know why it was not deleted by Prometheus too. ):

GiedriusS · 2019-04-23T21:06:48Z

pkg/ui/templates/graph.html

@@ -15,15 +13,21 @@

    <script src="{{ pathPrefix }}/static/vendor/mustache/mustache.min.js?v={{ buildVersion }}"></script>
    <script src="{{ pathPrefix }}/static/vendor/js/jquery.selection.js?v={{ buildVersion }}"></script>
-    <script src="{{ pathPrefix }}/static/vendor/js/jquery.hotkeys.js?v={{ buildVersion }}"></script>
+    <!-- <script src="{{ pathPrefix }}/static/vendor/js/jquery.hotkeys.js?v={{ buildVersion }}"></script> -->


why is this commented out too, for example?

jojohappy · 2019-04-24T02:19:09Z

@GiedriusS Maybe we could play around this PATCH by the image jojohappy/thanos:upgrade_ui (:

Because we are following the Prometheus ui, as you said, I copied and pasted the relevant files and upgraded the frontend vendors for bootstrap 4.0. Exclude the store page, it wrote by @adrien-f . I just updated the style of label element.

The biggest changes for this PR is bootstrap, so a lot of style of dom elements would be updated, such as navbar and labels.

bwplotka

Thanks for this @jojohappy Looking good so far, will build docker image to test this out for all.

bwplotka · 2019-04-24T22:59:10Z

.gitignore

@@ -1,6 +1,7 @@
 /prometheus
 /thanos
 vendor/
+!pkg/ui/static/vendor


Let's change the upper vendor to /vendor/ then instead of this ?

bwplotka · 2019-04-25T07:53:29Z

Are we sure the security patch for query history issue is there as well?

jojohappy · 2019-04-25T08:32:29Z

Are we sure the security patch for query history issue is there as well?

@bwplotka I don't know what security patch you said, but I searched the list of prometheus issues, is this issue you mentioned?

GiedriusS · 2019-05-10T10:58:44Z

I'd love to continue with this PR since it would solve an important pain point. @jojohappy, could you please point me from which exact commit in https://github.com/prometheus/prometheus you've pulled this from? I'd love to double check.

povilasv · 2019-05-10T13:29:54Z

I've tested Thanos Rule and I get template: :64: function "since" not defined when opening /rules page.

povilasv · 2019-05-10T13:30:50Z

apart from that it looks awesome

jojohappy · 2019-05-10T14:31:06Z

I'd love to continue with this PR since it would solve an important pain point. @jojohappy, could you please point me from which exact commit in https://github.com/prometheus/prometheus you've pulled this from? I'd love to double check.

Thanks @GiedriusS ! I followed the ui of Prometheus v2.9.1: commit.

Signed-off-by: jojohappy <sarahdj0917@gmail.com>

jojohappy · 2019-05-11T05:38:14Z

@povilasv @GiedriusS I have updated the image for this PR: jojohappy/thanos:upgrade_ui and fixed the missing template function. PTAL, thanks!

adrien-f · 2019-05-13T08:37:43Z

Awesome work 🎉 !

GiedriusS

Double checked with that commit and everything seems clean AFAICT, and it works much better with the updated versions! Thank you a lot ❤️

povilasv · 2019-05-14T12:45:03Z

🥇 amazing

bwplotka

LGTM, I resolved conflicts and will merge on green & deploy it to our clusters (:

bwplotka · 2019-05-15T15:35:41Z

Thanks for massive work on this @jojohappy !! Really great help ❤️

povilasv · 2019-05-16T04:16:23Z

❤️ @jojohappy , can't wait to run it in production :)

jojohappy force-pushed the upgrade_ui branch from dab91d0 to 9ca547e Compare April 23, 2019 12:12

GiedriusS reviewed Apr 23, 2019

View reviewed changes

jojohappy force-pushed the upgrade_ui branch from 9ca547e to 38561e7 Compare April 24, 2019 04:19

bwplotka reviewed Apr 24, 2019

View reviewed changes

jojohappy force-pushed the upgrade_ui branch from 38561e7 to 316d091 Compare April 25, 2019 02:21

jojohappy added 6 commits May 11, 2019 08:20

Upgrade Thanos ui

393628a

Signed-off-by: jojohappy <sarahdj0917@gmail.com>

Upgrade thanos ui

e0da54b

Signed-off-by: jojohappy <sarahdj0917@gmail.com>

Add CHANGELOG

a5c5d44

Signed-off-by: jojohappy <sarahdj0917@gmail.com>

Update gitignore

b9fe4ee

Signed-off-by: jojohappy <sarahdj0917@gmail.com>

Fixed missing template function

9152719

Signed-off-by: jojohappy <sarahdj0917@gmail.com>

Update CHANGELOG

0f68bcc

Signed-off-by: jojohappy <sarahdj0917@gmail.com>

jojohappy force-pushed the upgrade_ui branch from 316d091 to 0f68bcc Compare May 11, 2019 05:28

GiedriusS approved these changes May 13, 2019

View reviewed changes

povilasv approved these changes May 14, 2019

View reviewed changes

Merge branch 'master' into upgrade_ui

5843cca

bwplotka approved these changes May 15, 2019

View reviewed changes

bwplotka merged commit 7a85812 into thanos-io:master May 15, 2019

jojohappy deleted the upgrade_ui branch August 21, 2019 02:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade ui #1066

Upgrade ui #1066

jojohappy commented Apr 23, 2019

povilasv commented Apr 23, 2019

bwplotka commented Apr 23, 2019

jojohappy commented Apr 23, 2019

GiedriusS commented Apr 23, 2019

GiedriusS Apr 23, 2019

jojohappy Apr 24, 2019

GiedriusS Apr 23, 2019

jojohappy commented Apr 24, 2019 •

edited

Loading

bwplotka left a comment

bwplotka Apr 24, 2019

bwplotka commented Apr 25, 2019

jojohappy commented Apr 25, 2019 •

edited

Loading

GiedriusS commented May 10, 2019 •

edited

Loading

povilasv commented May 10, 2019

povilasv commented May 10, 2019 •

edited

Loading

jojohappy commented May 10, 2019

jojohappy commented May 11, 2019

adrien-f commented May 13, 2019

GiedriusS left a comment

povilasv commented May 14, 2019

bwplotka left a comment •

edited

Loading

bwplotka commented May 15, 2019

povilasv commented May 16, 2019 •

edited

Loading

Upgrade ui #1066

Upgrade ui #1066

Conversation

jojohappy commented Apr 23, 2019

Changes

Verification

povilasv commented Apr 23, 2019

bwplotka commented Apr 23, 2019

jojohappy commented Apr 23, 2019

GiedriusS commented Apr 23, 2019

GiedriusS Apr 23, 2019

Choose a reason for hiding this comment

jojohappy Apr 24, 2019

Choose a reason for hiding this comment

GiedriusS Apr 23, 2019

Choose a reason for hiding this comment

jojohappy commented Apr 24, 2019 • edited Loading

bwplotka left a comment

Choose a reason for hiding this comment

bwplotka Apr 24, 2019

Choose a reason for hiding this comment

bwplotka commented Apr 25, 2019

jojohappy commented Apr 25, 2019 • edited Loading

GiedriusS commented May 10, 2019 • edited Loading

povilasv commented May 10, 2019

povilasv commented May 10, 2019 • edited Loading

jojohappy commented May 10, 2019

jojohappy commented May 11, 2019

adrien-f commented May 13, 2019

GiedriusS left a comment

Choose a reason for hiding this comment

povilasv commented May 14, 2019

bwplotka left a comment • edited Loading

Choose a reason for hiding this comment

bwplotka commented May 15, 2019

povilasv commented May 16, 2019 • edited Loading

jojohappy commented Apr 24, 2019 •

edited

Loading

jojohappy commented Apr 25, 2019 •

edited

Loading

GiedriusS commented May 10, 2019 •

edited

Loading

povilasv commented May 10, 2019 •

edited

Loading

bwplotka left a comment •

edited

Loading

povilasv commented May 16, 2019 •

edited

Loading